Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <[email protected]>
Fri, 6 Jul 2018 21:12:06 +0000 (17:12 -0400)
committerTom Rini <[email protected]>
Fri, 6 Jul 2018 21:12:06 +0000 (17:12 -0400)

Trivial merge